account/models.py

@@ -390,8 +390,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             sr = SalesResponsibilityInfo.objects.get(user_id=self.user_id)
              

                         except SalesResponsibilityInfo.DoesNotExist:
              

                             sr = None
              

                -        sr_id = sr.sr_id if sr else ''
              

                -        is_sr = True if sr else False
              

                +        sr_id = sr.sr_id if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else ''
              

                +        is_sr = True if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else False
              

                         is_super_sr = True if sr and sr.is_super else False
              

                         return {
              

                             'sr_id': sr_id,
              

sales/views.py

@@ -50,7 +50,7 @@ def sr_distributor_tj(request):

                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                     distributor_id = request.POST.get('distributor_id', '')
              

                 
              

                -    sales = SalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, distributor_id=distributor_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-is_important')
              

                +    sales = SalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, distributor_id=distributor_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-is_important', '-yesterday_num')
              

                     sales = [sale.data for sale in sales]
              

                 
              

                     return response(data={